From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 21 Feb 2018 12:09:48 +0000 (+0100)
Subject: keyboard: Fix a warning
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~994^2^2~12
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2bce1f1510add45c2f0865f9e6bc0bd18be66e57;p=gnome-shell.git

keyboard: Fix a warning

imports.misc.ibusManager.IBus is declared as const, so referencing it
from another module triggers a warning with recent mozjs. As of commit
083d11a0327 IBus is mandatory, so just make it a regular import to avoid
the warning.
---

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index c27442984..7daa19870 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -3,6 +3,7 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const IBus = imports.gi.IBus;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
@@ -10,7 +11,6 @@ const Signals = imports.signals;
 const St = imports.gi.St;
 const Gettext = imports.gettext;
 
-const IBus = imports.misc.ibusManager.IBus;
 const IBusManager = imports.misc.ibusManager;
 const KeyboardManager = imports.misc.keyboardManager;
 const Main = imports.ui.main;